From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 8 Nov 2009 00:03:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9601
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bc2adfb5059e5b4ae6ad5b80c0b7a868e3f35a77;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89f218a02bd..5e6f2cc1ecc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
 2009-11-07  Michael Albinus  <michael.albinus@gmx.de>
 
-	Sync with Tramp 2.1.16.
+	Sync with Tramp 2.1.17.
 
 	* net/tramp.el (tramp-handle-copy-directory): Don't use
 	`file-remote-p' (due to compatibility).